cleaned up and made minor design changes
Merge pull request #2 from rgabrielsson/cleanup

cleaned up and made minor design changes