You'll probably be more pleased with the results if you have your car buffed out. I would do this after clay bar-ing. If you know how to do it, knock yourself out, otherwise take it to a detailer. As for window cleaner, try a solution of half windshield washer fluid, half water, and use newspaper.
