Cleanup quote marks for consistency
Rename grid variables for readability