Sprint refactoring (work in progress, here with baby steps)