Code refactoring

I don't like the idea we have something below `return` How is it supposed to work? :japanese_ogre: