Some code cleanup, and improved routing progress print statements