correction and simplification