cleanup
refactoring
more refactoring
Merge pull request #1 from spaghetticode/master

refactoring