Cleanup and added createSquare