Refactoring canvas