Remove unnecessary end tag
Refactor routes