Did some overall clean-up