refactor route declarations