quick tidy up still not quite right