tidying up function names