code cleaning, use RelVal sample