more formatting and javadoc goodness