The grand refactor