* cosmetic changes
* logger API moved up