some comments and rename