Merge pull request #25 from NicerHugs/master

organizes code further