ABQ update - improve formatting