Bit of cleanUP