code cleanup
Merge pull request #60 from jmr12345/development

code cleanup