added some changes for the formatter