Refine the names and add comments.