diff --git a/include/mkroom.h b/include/mkroom.h
index bac5a76e7..6f2c1eeb2 100644
--- a/include/mkroom.h
+++ b/include/mkroom.h
@@ -100,10 +100,11 @@ enum roomtype_types {
 
 #define IS_ROOM_PTR(x)      ((x) >= g.rooms && (x) < g.rooms + MAXNROFROOMS)
 #define IS_ROOM_INDEX(x)    ((x) >= 0 && (x) < MAXNROFROOMS)
-#define IS_SUBROOM_PTR(x)   ((x) >= g.subrooms && (x) < g.subrooms + MAXNROFROOMS)
-#define IS_SUBROOM_INDEX(x) ((x) > MAXNROFROOMS && (x) < (MAXNROFROOMS * 2))
-#define ROOM_INDEX(x)       ((x) -g.rooms)
-#define SUBROOM_INDEX(x)    ((x) -g.subrooms)
+#define IS_SUBROOM_PTR(x) \
+    ((x) >= g.subrooms && (x) < g.subrooms + MAXNROFROOMS)
+#define IS_SUBROOM_INDEX(x) ((x) > MAXNROFROOMS && (x) <= (MAXNROFROOMS * 2))
+#define ROOM_INDEX(x)       ((x) - g.rooms)
+#define SUBROOM_INDEX(x)    ((x) - g.subrooms)
 #define IS_LAST_ROOM_PTR(x) (ROOM_INDEX(x) == g.nroom)
 #define IS_LAST_SUBROOM_PTR(x) (!g.nsubroom || SUBROOM_INDEX(x) == g.nsubroom)
 
diff --git a/src/mklev.c b/src/mklev.c
index a011e0da3..1053b7f59 100644
--- a/src/mklev.c
+++ b/src/mklev.c
@@ -313,7 +313,7 @@ makerooms(void)
                 iflags.in_lua = g.in_mk_themerooms = TRUE;
                 g.themeroom_failed = FALSE;
                 lua_getglobal(themes, "themerooms_generate");
-                if ( nhl_pcall(themes, 0, 0)){
+                if (nhl_pcall(themes, 0, 0)) {
                     impossible("Lua error: %s", lua_tostring(themes, -1));
                 }
                 iflags.in_lua = g.in_mk_themerooms = FALSE;
@@ -949,7 +949,7 @@ makelevel(void)
             if (check_room(&g.vault_x, &w, &g.vault_y, &h, TRUE)) {
  fill_vault:
                 add_room(g.vault_x, g.vault_y, g.vault_x + w, g.vault_y + h,
-                        TRUE, VAULT, FALSE);
+                         TRUE, VAULT, FALSE);
                 g.level.flags.has_vault = 1;
                 ++room_threshold;
                 g.rooms[g.nroom - 1].needfill = FILL_NORMAL;