pushing genevieve's refactor
cleaning up routes