Just Cleaned Up a Bit