Cleaned up function names