newlines and javadoc correction