Another great and cheap diy window cleaner involves rubbing alcohol, vinegar and cornstarch with water. I don’t remember the ratios, but I’ve never seen glass/mirrors look so amazingly clean and sparkly. I love the idea of using the Rain-X too.