JavaDoc, misc cleanup