More setup refactoring