Minor changes and cleanup
Minor changes and cleanup