Result refactoring