Extra comments and reformatting to legacy status provider