If you're lucky enough to have a dedicated broom closet, make sure that the space is working overtime. Install individual broom and mop hooks or strips with multiple wire shelving holders to hang on the inside of the closet. If there's an outlet in the closet, install the Dust Buster there. If not, look for a convenient location near an outlet where it can be mounted on the wall.
