Minor refactoring (removed unnecessary get/set methods)