Continuing refactoring of results output