#132013: refactorings and javadoc