light refactoring to clean-up after recent changes