code cleanup
Merge pull request #6 from rwwarren/dev

code cleanup