clean up function names