Cleaned up more (I think I finally understand routes now...)