refactored routes
refactored a bit more