Cleaned Up for Merge