added readability/maintainability changes
Merge pull request #77 from Ricky1833/master

added readability/maintainability changes