Refactoring to Squire