Tidied data structures and removed unnecessary code
Merge branch 'master' of github.com:ljmu-cms/automark