Chihuahua who goes indoor?

My chi has been trained to be an indoor dog and I have a "u go dog" system where he does his business but I have gotten tired of cleaning the mess and he's so freaked out about going outdoors. I do not like the order it leaves if I don't clean it right away! Any tips? Are there better systems to control order out there??