+ refine code