minor changes while thinking to a refactoring