Fixed formatting and build.xml. Fixed legacy code formatting as well.