Refactor "Case" to "Square"