Refactor/Javadoc