Refactoring / Scaffolding End.