minor javadoc changes, reformated imports