Updates and cleanups

@jcredding again with the again - just housecleaning - no behavior changes.