More cleanup / JavaDocs