Removed unnecessary uses of getters