moving substituition to a Utils module