Cleaned Up A lot of stuff