Cleaning up function names