Update comments and rearrange content.