cleanups and updated axis to DefaultLinearAxis