Cleaned up some misc code and moved logic to format the message reported to the lint groomer