Remove empty helper
Move NullLogger to its own file
A bit of stylistic whitespace