fix comment ordering