Cleaned up function config-related code