Refactoring scaffolding