comments and rearrange method order