Tweak and abstract result formatting