Various Cleaning and Simplifying corrections 4