Javadoc and Refactored