clean up function signatures