code cleanup
Merge pull request #17 from andybooj/development

code cleanup