Refactored a little routes