Refactors to highlight the moving parts