rfwgen tidy up