Fixed and Cleaned Up