Clean up design a bit

resolves #2
Merge pull request #8 from saibotsivad/master

Clean up design a bit