Cleanup & tweak canvas mixin