Code clean-up
Merge pull request #3 from jbuck/cleanup

Code clean-up