Cleaned up the javadoc