Move outside of conditional