Refactoring
Refactor Canvas