rename and add comments