more refactoring
Merge pull request #3 from mswertz/master

refactored