Prettifying the code.
Merge branch 'master' of github.com:ivankliuk/refactoring