Cleaning up function naming