quick refact