Results refactoring.