Added Javadoc and reduced visibility