Fix/unify logger