[cleanup] Better logger usage