Refactor columns