Refactoring and Shapes