More Javadoc and make fields private