Rework, simplify