Fewer and more appropriate logging statements