Javadoc and cleanup