Logger tested. Some cleanup.