cleaned up player picking