Cleaning and Modifying things -- not the most recent as I'm still testing changes