indenting & javadoc comment fixes