Canvas calculator - refactoring