Refactor route create