Refactor, refactor, refactor