Finish refactor to small column sizes