Rework and clean-up