More cleaning and minor fixes
Merge branch 'master' of https://github.com/allantsai123/COSC310project
Merge branch 'master' of https://github.com/allantsai123/COSC310project
Merge branch 'master' of https://github.com/allantsai123/COSC310project