Tidy up
More tidying up