Refactor route params