Use a Map instead of two separate methods to create the name/value pairs
Remove one-use step variables