Rename and add some comments