Minor change
Minor changes
More cleanup