Refactor play state