Finish refact