Cleaned up code for dynamic values

in MapFunction()