refactor a few things for a cleaner routes section