refactor conditional
refactor conditional