Some comments and cleaning