Do generic cleanup

Minor housekeeping commit with small changes in the Utils class.