comments and simplifications