Refactor!