Various Cleaning and Simplifying corrections 3