refactored a ton
Merge pull request #8 from Thimoteus/refactoring

refactored a ton