Bit of a cleanup.