Code clean-up
Merge pull request #14 from mcongrove/master

Code clean-up