Refactor ...