Also Java code should be using 2-space indents (they became 4 in some places)