Refactored game and step definitions