Yes, that could be improved. Russia didn't really seem to be focused on tourism when I was there. In a way, that made the experience seem more genuine. I visited a friend who was staying in a cheap Moscow hotel that had seen better days. To me, the building itself looked like it used to be for very wealthy people but when I went to the faucet to wash my hands rusty water came out. So, my impression that hardly any people were using it was quite correct. Only way you get rust colored tap water is if the lines have been stagnant for a long period. It did seem to clear up after a bit. Another thing I noticed was in old official buildings in Southern Russia the walls were mostly painted white. You need to avoid brushing up against them because the white paint sheds a chalk like residue on your clothes. The train I rode south on was old but well maintained. The pace is slow but it was interesting watching the scenery going by.