Cleanup of Player movement logic