comments and simplification