update to routes
refactor, more style, happy times