Clean up logging a little