diff --git a/cmd/provider-services/cmd/manifest.go b/cmd/provider-services/cmd/manifest.go
index 151340e8..e69a58f2 100644
--- a/cmd/provider-services/cmd/manifest.go
+++ b/cmd/provider-services/cmd/manifest.go
@@ -140,7 +140,7 @@ func doSendManifest(cmd *cobra.Command, sdlpath string) error {
 		return err
 	}
 
-	// the owner address in FlagFrom has already been validated thus save to just pull its value as string
+	// the owner address in FlagFrom has already been validated thus safe to just pull its value as string
 	leases, err := leasesForDeployment(ctx, cctx, cmd.Flags(), queryClientOrNil(cl))
 	if err != nil {
 		return markRPCServerError(err)
diff --git a/gateway/rest/router.go b/gateway/rest/router.go
index 491392d3..a82d1d49 100644
--- a/gateway/rest/router.go
+++ b/gateway/rest/router.go
@@ -57,7 +57,7 @@ const (
 
 const (
 	// as per RFC https://www.iana.org/assignments/websocket/websocket.xhtml#close-code-number
-	// errors from private use staring
+	// errors from private use starting
 	websocketInternalServerErrorCode = 4000
 	websocketLeaseNotFound           = 4001
 	manifestSubmitTimeout            = 120 * time.Second
diff --git a/gateway/rest/router_migrate.go b/gateway/rest/router_migrate.go
index d7a25922..15ddd7c3 100644
--- a/gateway/rest/router_migrate.go
+++ b/gateway/rest/router_migrate.go
@@ -43,7 +43,7 @@ func migrateHandler(log log.Logger, hostnameService clustertypes.HostnameService
 		owner := requestOwner(req)
 
 		// Make sure this hostname can be taken
-		//  make sure destination deployment actually exists
+		// make sure destination deployment actually exists
 		found, leaseID, mgroup, err := clusterService.FindActiveLease(req.Context(), owner, body.DestinationDSeq, body.DestinationGSeq)
 		if err != nil {
 			log.Error("failed checking if destination deployment exists", "err", err)
diff --git a/gateway/rest/router_shell.go b/gateway/rest/router_shell.go
index 8a04ead3..83020f4c 100644
--- a/gateway/rest/router_shell.go
+++ b/gateway/rest/router_shell.go
@@ -60,7 +60,7 @@ func leaseShellWebsocketHandler(log log.Logger, wg *sync.WaitGroup, shellWs *web
 		case LeaseShellCodeTerminalResize:
 			var size remotecommand.TerminalSize
 			r := bytes.NewReader(msg)
-			// Unpack data, its just binary encoded data in big endian
+			// Unpack data, it's just binary encoded data in big endian
 			err = binary.Read(r, binary.BigEndian, &size.Width)
 			if err != nil {
 				return
diff --git a/service.go b/service.go
index b2280e01..a5f9e4be 100644
--- a/service.go
+++ b/service.go
@@ -242,16 +242,16 @@ func (s *service) Validate(ctx context.Context, owner sdktypes.Address, gspec dt
 
 	// inv, err := s.cclient.Inventory(ctx)
 	// if err != nil {
-	// 	return ValidateGroupSpecResult{}, err
+	//	return ValidateGroupSpecResult{}, err
 	// }
 	//
 	// res := &reservation{
-	// 	resources:     nil,
-	// 	clusterParams: nil,
+	//	resources:     nil,
+	//	clusterParams: nil,
 	// }
 	//
 	// if err = inv.Adjust(res, ctypes.WithDryRun()); err != nil {
-	// 	return ValidateGroupSpecResult{}, err
+	//	return ValidateGroupSpecResult{}, err
 	// }
 
 	price, err := s.config.BidPricingStrategy.CalculatePrice(ctx, req)