finish refac