Fix indentation.
Fix typo in javadoc.
Fix indentation.
Improve javadoc.
Improve javadoc.
Code simplification.