Cleanup + small change in Players.java