Tidy Up of Logging