Cleanup and filling out the grid classes