Code clean-up and logging level adjustments.