Some JavaDocs / cleanup