cleaned up code, added build.xml