Doing this mapping thing didn't make it more readable or less complex, I would put it back.