reformat some missed style and remove unused comments