Updated and cleaned up the Javadocs