--- a/src/rail_map.h
+++ b/src/rail_map.h
@@ -213,7 +213,7 @@
 	assert(b != INVALID_TRACK_BIT);
 	assert(!TracksOverlap(b));
 	Track track = RemoveFirstTrack(&b);
-	SB(_m[t].m2, 8, 3, track == INVALID_TRACK ? 0 : track+1);
+	SB(_m[t].m2, 8, 3, track == INVALID_TRACK ? 0 : track + 1);
 	SB(_m[t].m2, 11, 1, (byte)(b != TRACK_BIT_NONE));
 }
 

--- a/src/window.cpp
+++ b/src/window.cpp
@@ -1038,9 +1038,9 @@
 	/* Left part of the rectangle may be at most 1/4 off-screen,
 	 * right part of the rectangle may be at most 1/2 off-screen
 	 */
-	if (left < -(width>>2) || left > _screen.width - (width>>1)) return false;
+	if (left < -(width >> 2) || left > _screen.width - (width >> 1)) return false;
 	/* Bottom part of the rectangle may be at most 1/4 off-screen */
-	if (top < 22 || top > _screen.height - (height>>2)) return false;
+	if (top < 22 || top > _screen.height - (height >> 2)) return false;
 
 	/* Make sure it is not obscured by any window. */
 	const Window *w;