Refactored so it's easy to tell the diference between the Ptolemy Java
and the Mote Java, also makes it consistent with the report.