Clean up logging a bit