Polish up logging a bit