Fixed formatting, updated build.xml