extra line after javadoc description

and other simplification