one more small style fix
extracted maps' key and value unmarshaling to separate function