Refactor player interface some more