improved on javadoc / code style