Indentation, removal of test System.out.println's