clean up logging a bit