Change log pattern and remove if() goards for logging