Added "Javadoc" comments.  Minor changes to increase maintainability index