Cleanup and reformatting of some structs in g_local.h