logging: address comments on cleanup