Instead of riffling to a card, spread/dribble to a card. That way, there is motivation for the squaring action. There is no reason to square a clean deck. I would suggest either, spreading/dribbling to the card, displaying it, and reassembling the cards, leaving the deck messy and coming back later to square/shift the pack, or perform a dribble/spread pass. The former breaks the actions up, thus removing suspicion of a tricky move, and the latter is a logical followup action that has motivation. I hope that helped!