add comments, modify names, delete debug codes