naming and simplification