FakeLogger and some tiny refactorings