Refactored, changed gameState and movementType to enums