internal: make logs less cluttering

internal: make logs less cluttering

Many logs are under an if-clause, making them take more space
than necessary. This replaces most of if-clause-and-logs
with one-liners to improve readability.

Change-Id: I7e9ada35160974c8cc38de1c6e0217de15912c6e