rdbaker: made code more align with codepro's audit