A bit more cleanup
Final proof reading pass