diff --git a/dirtiles.cpp b/dirtiles.cpp
index 757b1c6c..3104cafd 100644
--- a/dirtiles.cpp
+++ b/dirtiles.cpp
@@ -152,48 +152,48 @@ std::vector<zxy> enumerate_dirtiles(const char *fname) {
 }
 
 sqlite3 *dirmeta2tmp(const char *fname) {
-        sqlite3 *db;
-        char *err = NULL;
+	sqlite3 *db;
+	char *err = NULL;
 
-        if (sqlite3_open("", &db) != SQLITE_OK) {
-                fprintf(stderr, "Temporary db: %s\n", sqlite3_errmsg(db));
-                exit(EXIT_FAILURE);
-        }
-        if (sqlite3_exec(db, "CREATE TABLE metadata (name text, value text);", NULL, NULL, &err) != SQLITE_OK) {
-                fprintf(stderr, "Create metadata table: %s\n", err);
-                exit(EXIT_FAILURE);
-        }
+	if (sqlite3_open("", &db) != SQLITE_OK) {
+		fprintf(stderr, "Temporary db: %s\n", sqlite3_errmsg(db));
+		exit(EXIT_FAILURE);
+	}
+	if (sqlite3_exec(db, "CREATE TABLE metadata (name text, value text);", NULL, NULL, &err) != SQLITE_OK) {
+		fprintf(stderr, "Create metadata table: %s\n", err);
+		exit(EXIT_FAILURE);
+	}
 
-        std::string name = fname;
-        name += "/metadata.json";
+	std::string name = fname;
+	name += "/metadata.json";
 
-        FILE *f = fopen(name.c_str(), "r");
-        if (f == NULL) {
-                perror(name.c_str());
-                exit(EXIT_FAILURE);
-        }
+	FILE *f = fopen(name.c_str(), "r");
+	if (f == NULL) {
+		perror(name.c_str());
+		exit(EXIT_FAILURE);
+	}
 
-        json_pull *jp = json_begin_file(f);
-        json_object *o = json_read_tree(jp);
+	json_pull *jp = json_begin_file(f);
+	json_object *o = json_read_tree(jp);
 
-        if (o->type != JSON_HASH) {
-                fprintf(stderr, "%s: bad metadata format\n", name.c_str());
-                exit(EXIT_FAILURE);
-        }
+	if (o->type != JSON_HASH) {
+		fprintf(stderr, "%s: bad metadata format\n", name.c_str());
+		exit(EXIT_FAILURE);
+	}
 
-        for (size_t i = 0; i < o->length; i++) {
-                if (o->keys[i]->type != JSON_STRING || o->values[i]->type != JSON_STRING) {
-                        fprintf(stderr, "%s: non-string in metadata\n", name.c_str());
-                }
+	for (size_t i = 0; i < o->length; i++) {
+		if (o->keys[i]->type != JSON_STRING || o->values[i]->type != JSON_STRING) {
+			fprintf(stderr, "%s: non-string in metadata\n", name.c_str());
+		}
 
-                char *sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES (%Q, %Q);", o->keys[i]->string, o->values[i]->string);
-                if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) {
-                        fprintf(stderr, "set %s in metadata: %s\n", o->keys[i]->string, err);
-                }
-                sqlite3_free(sql);
-        }
+		char *sql = sqlite3_mprintf("INSERT INTO metadata (name, value) VALUES (%Q, %Q);", o->keys[i]->string, o->values[i]->string);
+		if (sqlite3_exec(db, sql, NULL, NULL, &err) != SQLITE_OK) {
+			fprintf(stderr, "set %s in metadata: %s\n", o->keys[i]->string, err);
+		}
+		sqlite3_free(sql);
+	}
 
-        json_end(jp);
-        fclose(f);
-        return db;
+	json_end(jp);
+	fclose(f);
+	return db;
 }
diff --git a/main.cpp b/main.cpp
index f1f57031..cdf00b0b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1195,7 +1195,7 @@ int read_input(std::vector<source> &sources, char *fname, int maxzoom, int minzo
 			}
 
 			// Trim out characters that can't be part of selector
-                        std::string out;
+			std::string out;
 			for (size_t p = 0; p < trunc.size(); p++) {
 				if (isalpha(trunc[p]) || isdigit(trunc[p]) || trunc[p] == '_' || (trunc[p] & 0x80) != 0) {
 					out.append(trunc, p, 1);
@@ -2518,7 +2518,8 @@ int main(int argc, char **argv) {
 			src.layer = std::string(optarg).substr(0, cp - optarg);
 			src.file = std::string(cp + 1);
 			sources.push_back(src);
-		} break;
+			break;
+		}
 
 		case 'z':
 			if (strcmp(optarg, "g") == 0) {
@@ -2695,7 +2696,8 @@ int main(int argc, char **argv) {
 					exit(EXIT_FAILURE);
 				}
 			}
-		} break;
+			break;
+		}
 
 		case 'a': {
 			char *cp;
@@ -2707,7 +2709,8 @@ int main(int argc, char **argv) {
 					exit(EXIT_FAILURE);
 				}
 			}
-		} break;
+			break;
+		}
 
 		case 'v':
 			fprintf(stderr, VERSION);
diff --git a/tile-join.cpp b/tile-join.cpp
index 1f1762b2..b38db8cc 100644
--- a/tile-join.cpp
+++ b/tile-join.cpp
@@ -896,7 +896,8 @@ int main(int argc, char **argv) {
 			std::string before = std::string(optarg).substr(0, cp - optarg);
 			std::string after = std::string(cp + 1);
 			renames.insert(std::pair<std::string, std::string>(before, after));
-		} break;
+			break;
+		}
 
 		case 'q':
 			quiet = true;
diff --git a/tile.cpp b/tile.cpp
index ff37a8b9..94952acb 100644
--- a/tile.cpp
+++ b/tile.cpp
@@ -439,7 +439,7 @@ void *partial_feature_worker(void *v) {
 			}
 		}
 
-		(*partials)[i].geoms.clear();		 // avoid keeping two copies in memory
+		(*partials)[i].geoms.clear();  // avoid keeping two copies in memory
 		signed char t = (*partials)[i].t;
 		int z = (*partials)[i].z;
 		int line_detail = (*partials)[i].line_detail;
@@ -1501,46 +1501,43 @@ void preserve_attribute(attribute_op op, std::map<std::string, accum_state> &att
 				p.full_values[i].type = mvt_double;
 				break;
 
-			case op_max:
-				{
-					double existing = atof(p.full_values[i].s.c_str());
-					double maybe = atof(val.s.c_str());
-					if (maybe > existing) {
-						p.full_values[i].s = val.s.c_str();
-						p.full_values[i].type = mvt_double;
-					}
+			case op_max: {
+				double existing = atof(p.full_values[i].s.c_str());
+				double maybe = atof(val.s.c_str());
+				if (maybe > existing) {
+					p.full_values[i].s = val.s.c_str();
+					p.full_values[i].type = mvt_double;
 				}
 				break;
+			}
 
-			case op_min:
-				{
-					double existing = atof(p.full_values[i].s.c_str());
-					double maybe = atof(val.s.c_str());
-					if (maybe < existing) {
-						p.full_values[i].s = val.s.c_str();
-						p.full_values[i].type = mvt_double;
-					}
+			case op_min: {
+				double existing = atof(p.full_values[i].s.c_str());
+				double maybe = atof(val.s.c_str());
+				if (maybe < existing) {
+					p.full_values[i].s = val.s.c_str();
+					p.full_values[i].type = mvt_double;
 				}
 				break;
+			}
 
-			case op_mean:
-				{
-					auto state = attribute_accum_state.find(key);
-					if (state == attribute_accum_state.end()) {
-						accum_state s;
-						s.sum = atof(p.full_values[i].s.c_str()) + atof(val.s.c_str());
-						s.count = 2;
-						attribute_accum_state.insert(std::pair<std::string, accum_state>(key, s));
+			case op_mean: {
+				auto state = attribute_accum_state.find(key);
+				if (state == attribute_accum_state.end()) {
+					accum_state s;
+					s.sum = atof(p.full_values[i].s.c_str()) + atof(val.s.c_str());
+					s.count = 2;
+					attribute_accum_state.insert(std::pair<std::string, accum_state>(key, s));
 
-						p.full_values[i].s = milo::dtoa_milo(s.sum / s.count);
-					} else {
-						state->second.sum += atof(val.s.c_str());
-						state->second.count += 1;
+					p.full_values[i].s = milo::dtoa_milo(s.sum / s.count);
+				} else {
+					state->second.sum += atof(val.s.c_str());
+					state->second.count += 1;
 
-						p.full_values[i].s = milo::dtoa_milo(state->second.sum / state->second.count);
-					}
+					p.full_values[i].s = milo::dtoa_milo(state->second.sum / state->second.count);
 				}
 				break;
+			}
 
 			case op_concat:
 				p.full_values[i].s += val.s;