renaming, tidying up