refac, improvs