code clean-up and reorganization
Merge branch 'master' of github.com:ohearnk/CS467