Update javadoc
Format per coding standard
Refactor code to simplify and for readability