Clean up globals logging a bit