Ok, is there a module for functions like this on your cleanup branch? If so I'll create that module on this branch too and move this function into it. Otherwise, suggest we merge this branch as it is.