Finally a fix for reformatting comments