Clean up NavalBattle.java