Cleanup
Minor changes