Cleaned Up a Bit