More clean up.  Ready to submit
Merge branch 'branch1' of https://github.com/dcatipon/code_challenge.git