more connective refactoring