Fixed format for original java source, and commented it out (again)