Minor cleanup and performance enhancement...
More minor cleanups...