A bit of a clean-up