Clean up grid code a bit
GH-50 TODONE