Cleanded up routes in controllers