On 6 and 7 you can remove the else, because in if condition has return statement .