Commented code and Javadoc cleanup.