"return" was not reachable
a bit of PEP8-friendliness
removed code duplication