fixes: follow coding style for mapValues