More javadoc and formating