changed routes and cleaned up usings