cleaned up function calls