Reworking result formatting.