Refactoring and Update of Javadoc