Refactored result