General code cleanup and refactoring
Merge pull request #4 from vonclites/connor

General code cleanup and refactoring