Refactor for style/readability
Merge pull request #438 from projecthydra/refactor_style

Refactor for style/readability