Clean up some getters
Merge branch 'master' of https://github.com/SeanBarker/TrackerDeaths