Changed use of getter methods to straight variable access.