remove else after tail call; get more PEP8-compliant
manual merge