clean route and bug fix