cleaning up the code in toilets