Quick refact