refactor list-machines field funcs