Refactored output javadoc