For heavier soil use a mild detergent solution, rinse well, and wipe dry for more shine. To help avoid streaking, go over well rinsed floor with a dry Wonder Mop.
Wood floors require a nearly dry mopping.
To get a quick shine on your floors between waxings, use wax paper under your dust mop. The surface will shine while the dirt sticks to the wax paper. I use the Libman Wonder Mop to clean my baseboards. To keep a new kitchen floor clean and shining like new for years, don't use water or floor cleaners. My grandmother's floor stayed shiny and looking new for almost 10 years cleaning them only this way.