Code cleanup
Merge pull request #1 from mnbbrown/master

Code Cleanup