Yeah cleaning and organizing is part of the hunt. I put things on the right pegs, bring new figures to the front and toss any other toys that shouldn't be there. Plus it's the best way to make sure you didn't miss anything

 

I usually place the TFs in their corresponding pegs or usually place the same fig in one peg if there are multiples and expect the figures I'm looking for to suddenly appear like it's some video game puzzle reward. Hasn't happened so far.

 

If toys are on the floor I pick them up and try to find their spot on the shelves. Though the shops in my area seem to have become much tidier in recent years. I used to see kids running over the toys strewn around on the floor.