Refactoring: removed unnecessary getters.