More object refactoring -- turned some getters / class variables to constants.