Bit of a cleanup