Refactor refactor