Issue #10, fixing code quality issues
Merge pull request #79 from SuperCowPowers/Better_Code_Quality

Issue #10, fixing code quality issues