Just rearanging formatter
Updating logging