Fix indentation and javadoc