zrrichards: Improve javadoc and make fields private and final