Fix javadoc warnings, organize imports