Refactor result view