Clean-up and add comments to Javabot