Rearrange methods and modify comments