Some cleanup
Minor tweaks