Refactor column scale/axis creation/update