Refactored Player controllers