More tidying up, no func change