Refactor SquareType into Model