Cleaning up logging a bit