Code polish
Merge branch 'master' of https://github.com/Rob7045713/CMSC701Project