Cleaned up RectangleTool