Which Sentence best corrects the misplaced modifier?

We keep our broom and dustpan in the closet for when things get messy under the stairs.

A. Our broom and dustpan are kept in the closet for when things get messy under the stairs.

B. When things get messy under the stairs, we keep our broom and dustpan in the closet.

C. When things get messy, we keep our broom and dustpan for it under the stairs in the closet.

D. We keep our broom and dustpan in the closet under the stairs for when things get messy.