small refactor of the  ResultSet class hierarchy