more cleanup and design improvements
Merge pull request #3 from vdubmastertech/cleanup

more cleanup and design improvements