diff --git a/server/api/accounts/router.go b/server/api/accounts/router.go
index 8598cdd..5b62e1e 100644
--- a/server/api/accounts/router.go
+++ b/server/api/accounts/router.go
@@ -37,49 +37,47 @@ func Routes(
 
 	r.POST("", response.Handler(as.createAccount))
 
-	// TODO: make the subroutes more readable
+	platform := r.Group("/:acctID/platforms/:platform", pub.Publish("/:acctID/platforms"))
+	platform.PUT("/order-index", response.Handler(as.setOrderOfPlatformOnAccountPage))
+	platform.POST("/shops/mocks", response.Handler(as.createMockShop))
 
-	platformGroup := r.Group("/:acctID/platforms/:platform", pub.Publish("/:acctID/platforms"))
-	platformGroup.PUT("/order-index", response.Handler(as.setOrderOfPlatformOnAccountPage))
-	platformGroup.POST("/shops/mocks", response.Handler(as.createMockShop))
-
-	mockShops := platformGroup.Group("/shops/mocks/:shop-id")
+	mockShops := r.Group("/:acctID/platforms/:platform/shops/mocks/:shop-id", pub.Publish("/:acctID/platforms/:platform/shops/mocks/:shop-id"))
 	mockShops.POST("/listings", response.Handler(as.addMockListing))
 	mockShops.PUT("/listings/:listing-id", response.Handler(as.updateMockListing))
 	mockShops.DELETE("/listings/:listing-id", response.Handler(as.deleteMockListing))
 
-	syncGroups := r.Group("/:acctID/inventory/sync-groups")
-	syncGroups.POST("", pub.Publish("/:acctID/inventory/sync-groups"), response.Handler(as.saveNewSyncGroup))
+	syncGroups := r.Group("/:acctID/inventory/sync-groups", pub.Publish("/:acctID/inventory/sync-groups"))
+	syncGroups.POST("", response.Handler(as.saveNewSyncGroup))
 
-	draftListings := syncGroups.Group("/draft/listings", pub.Publish("/:acctID/inventory/sync-groups/draft/listings"))
+	draftListings := r.Group("/:acctID/inventory/sync-groups/draft/listings", pub.Publish("/:acctID/inventory/sync-groups/draft/listings"))
 	draftListings.POST("", response.Handler(as.createSyncGroupListingDraft))
 	draftListings.PUT("/:orderIndex/shop", response.Handler(as.setShopInSyncGroupListingDraft))
 	draftListings.PUT("/:orderIndex/listing", response.Handler(as.setListingInSyncGroupListingDraft))
 	draftListings.DELETE("/:orderIndex", response.Handler(as.deleteSyncGroupListingDraft))
 
-	mockModeGroup := r.Group("/:acctID/mock-mode", pub.Publish("/:acctID/mock-mode"))
-	mockModeGroup.PUT("", response.Handler(as.setMockMode))
+	mockMode := r.Group("/:acctID/mock-mode", pub.Publish("/:acctID/mock-mode"))
+	mockMode.PUT("", response.Handler(as.setMockMode))
 
-	mockSyncGroups := syncGroups.Group("/mock")
-	mockSyncGroups.POST("", pub.Publish("/:acctID/inventory/sync-groups/mock"), response.Handler(as.saveNewMockSyncGroup))
-	mockSyncGroups.DELETE("/:syncGroupID", pub.Publish("/:acctID/inventory/sync-groups/mock"), response.Handler(as.deleteMockSyncGroup))
-
-	setMockSyncGroupForEditingEndpoints := mockSyncGroups.Group("/editing", pub.Publish("/:acctID/inventory/sync-groups/mock/editing"))
-	setMockSyncGroupForEditingEndpoints.PUT("", response.Handler(as.selectMockSyncGroupForEditing))
-	setMockSyncGroupForEditingEndpoints.POST("", response.Handler(as.saveMockSyncGroupBeingEdited))
-	setMockSyncGroupForEditingEndpoints.DELETE("", response.Handler(as.cancelMockSyncGroupEdits))
-	setMockSyncGroupForEditingEndpoints.POST("/listings", response.Handler(as.addListingToMockSyncGroupBeingEdited))
-
-	mockSyncGroupBeingEdited := mockSyncGroups.Group("/:syncGroupID/editing", pub.Publish("/:acctID/inventory/sync-groups/mock/:syncGroupID/editing"))
-	mockSyncGroupBeingEdited.PUT("/listings/:orderIndex/shop", response.Handler(as.setShopInListingInMockSyncGroupBeingEdited))
-	mockSyncGroupBeingEdited.PUT("/listings/:orderIndex/listing", response.Handler(as.setListingInListingInMockSyncGroupBeingEdited))
-	mockSyncGroupBeingEdited.DELETE("/listings/:orderIndex", response.Handler(as.deleteListingInListingInMockSyncGroupBeingEdited))
-
-	mockDraftListings := mockSyncGroups.Group("/draft/listings", pub.Publish("/:acctID/inventory/sync-groups/mock/draft/listings"))
+	mockDraftListings := r.Group("/:acctID/inventory/sync-groups/mock/draft/listings", pub.Publish("/:acctID/inventory/sync-groups/mock/draft/listings"))
 	mockDraftListings.POST("", response.Handler(as.createMockSyncGroupListingDraft))
 	mockDraftListings.PUT("/:orderIndex/shop", response.Handler(as.setShopInMockSyncGroupListingDraft))
 	mockDraftListings.PUT("/:orderIndex/listing", response.Handler(as.setListingInMockSyncGroupListingDraft))
 	mockDraftListings.DELETE("/:orderIndex", response.Handler(as.deleteMockSyncGroupListingDraft))
+
+	mockSyncGroups := r.Group("/:acctID/inventory/sync-groups/mock", pub.Publish("/:acctID/inventory/sync-groups/mock"))
+	mockSyncGroups.POST("", response.Handler(as.saveNewMockSyncGroup))
+	mockSyncGroups.DELETE("/:syncGroupID", pub.Publish("/:acctID/inventory/sync-groups/mock"), response.Handler(as.deleteMockSyncGroup))
+
+	mockSyncGroupEditing := r.Group("/:acctID/inventory/sync-groups/mock/editing", pub.Publish("/:acctID/inventory/sync-groups/mock/editing"))
+	mockSyncGroupEditing.PUT("", response.Handler(as.selectMockSyncGroupForEditing))
+	mockSyncGroupEditing.POST("", response.Handler(as.saveMockSyncGroupBeingEdited))
+	mockSyncGroupEditing.DELETE("", response.Handler(as.cancelMockSyncGroupEdits))
+	mockSyncGroupEditing.POST("/listings", response.Handler(as.addListingToMockSyncGroupBeingEdited))
+
+	mockSyncGroupBeingEdited := r.Group("/:acctID/inventory/sync-groups/mock/:syncGroupID/editing", pub.Publish("/:acctID/inventory/sync-groups/mock/:syncGroupID/editing"))
+	mockSyncGroupBeingEdited.PUT("/listings/:orderIndex/shop", response.Handler(as.setShopInListingInMockSyncGroupBeingEdited))
+	mockSyncGroupBeingEdited.PUT("/listings/:orderIndex/listing", response.Handler(as.setListingInListingInMockSyncGroupBeingEdited))
+	mockSyncGroupBeingEdited.DELETE("/listings/:orderIndex", response.Handler(as.deleteListingInListingInMockSyncGroupBeingEdited))
 }
 
 // POST /