style and structure changes
Merge branch 'master' of github.com:curryninja123/CompSci2014
merging local and other works