Improved code readability
Merge pull request #18 from Forsevin/master

Improved code readablity