Removing obsolete comments; tweaking output