Move actions outside of if