simplification and correction