simplification improvements