End of the javadoc and small refactorings