Bit of house cleaning + D.