Minor tweaks and cleanup
Minor tweaks and cleanup