Added tweaked formatter
merge