fix JavaDoc
fix indenting
&& should be on a new line
wrap long line