Updated comments and added various extraneous bells and whistles as
suggested by Checkstyle.