Clean, add some jdocs, comments