Validated and Cleaned Up!