Cleaned Up

Not much changed