cleaned up function names