Getting rid of some useless getters/setters and starting to get rid of uglyCamelCase.