minor code clean
Merge branch 'master' of https://github.com/nadinebo/CPSC304