Logging configurable.
Slightly better structure.