Refactor the Axis