Typo, javadoc and bugFix.
Format
Code convention