Refactoring.
Merge pull request #31 from mjafshar/merge_user_route_requests

Refactoring.