slightly changed formatter