refactoring, made 2D square