More formatting and javadoc