Changed javadoc-ing slightly