more comments and cleaning