Some easy refactoring to make code little bit more readable