Implemented distinct drawing procedures for game state and refactored