Some refactoring in playerControlSystem