Minor logging clean up