Stylistic cleanup. Also added unique IDs to each gridSquare