Cleaned up some code
Merge branch 'new-master' of https://github.com/Aleph-Naught/SE3350Y into new-master