Updated codebase to make it more palatable
Merge pull request #3 from shicholas/refactoring

Updated codebase to make it more palatable