Tidy up code
Merge branch 'master' of github.com:michaelmcfadyen/DIM3-Project