remove ugly multi returns