More getters, refactoring, simplify code.