Refactor routes declaration