Refactor and Clean Up the Existing Codebase

[andrewbwm]

This is an umbrella issue to group together all of the existing issues that deal with code/design refactoring and cleanup

• [ ] #24
• [ ] #19
• [ ] #14
• [ ] #7
• [ ] #16