Remove underscore, add range to utils