Renaming and cleanup of code
Merge branch 'master' of https://github.com/chr22/AMS-Project