Remove extraneous code to improve readability
Merge pull request #24 from daguar/refactor-for-readability

Remove extraneous code to improve readability