Cleaned up route management a tiny bit