Refactor indeed