Cleaned Up A Bit.