Refactor Result Class.