logger: Some cleanup