Refactor code for clarity
Merge pull request #6 from pwojt/style_readable

Refactor code for clarity