Refactor, refactor, refactor!