Logger : refactor all uses of Logger to get clean logs