Refactor playing state