Simple refact