Update for calling canvas_utils
Update code cleanup