Simple code cleanup
Merge pull request #2 from mgaskill/simple-code-enhancements

Simple code cleanup