Cleaned things up a bit and changed routes to not break