Refactored square to be a drawable object