some comments and cleaning