Improve code readability
Merge pull request #39 from ch3ric/fix-improve-readability

Improve code readability