Additional Javadoc and cleanup