refactored most things
Merge pull request #53 from skuhlmann/refactor

refactored most things