Routine builder re-factory