Refactored game states to make use of new service getter methods