Cleanup and enhancement following my Yosemite install