Cleaned up `util.logging` - not done but much better