some minor cleanups to existing logic and behavior

No behavior changes - just cleaning some things up.