Rename and add comments.