refactored some more
Merge pull request #3 from Pouncealot/master

refactored some more