Various Cleaning and Simplifying corrections 2