finished refactoring getters. made program compile