Cleaned up the grid