Some tidying up, reworking the axees