Cleaned up logging on and off a little more

Logging on and off should be cleaner now.