cba'd with javadocs so only updated the rest of the format