CODE: Refactor Canvas.