For better comprehension, I think that it is better to not use else-clauses if the body of the if-statement contains a return-statement. Therefore, I think it would be better to unwrap the else block in this case.