Clean up and javadoc