Final refact