Refactored player position