NEarly there, tidying things up