Refactored minorly. Javadoc - removed entries without description.