Remove duplicated code again: utils
Remove duplicated code again: dump