squash, refactoring