revise format & comments