handle  and  in
refactoring