Refactoring on sketch