Bit of a cleanup...