Update refacterl