clean up and tighten routes