More cleanup
More cleanup
Minor changes