code cleanup and commentary... use new checkstyle suppress warning
support.