yet some Log refactors