diff --git a/Makefile.blackbox b/Makefile.blackbox
index 255403643..a55824800 100644
--- a/Makefile.blackbox
+++ b/Makefile.blackbox
@@ -2,10 +2,7 @@ CC=clang
 CXX=clang++
 LD=clang++
 SIZE=size
-#GDB=gdb
-#OBJCOPY=$(TOOLCHAIN)-objcopy
 
-#LDFLAGS += -pagezero_size 100000000
 LDFLAGS =
 
 USE_LIBA=1
diff --git a/Makefile.simulator b/Makefile.simulator
index c79797934..222834079 100644
--- a/Makefile.simulator
+++ b/Makefile.simulator
@@ -2,7 +2,5 @@ CC=gcc
 CXX=g++
 LD=g++
 SIZE=size
-#GDB=gdb
-#OBJCOPY=$(TOOLCHAIN)-objcopy
 
 USE_LIBA=0
diff --git a/ion/src/device/Makefile b/ion/src/device/Makefile
index 083f65748..fb0d9fac2 100644
--- a/ion/src/device/Makefile
+++ b/ion/src/device/Makefile
@@ -1,4 +1,10 @@
 include ion/src/device/boot/Makefile
 objs += $(addprefix ion/src/device/, init.o heap.o)
-objs += $(addprefix ion/src/device/display/, display.o dma.o framebuffer.o gpio.o spi.o st7586.o)
+objs += $(addprefix ion/src/device/display/,\
+				display.o\
+				dma.o\
+				framebuffer.o\
+				gpio.o\
+				spi.o\
+				st7586.o)
 objs += $(addprefix ion/src/device/keyboard/, keyboard.o)
diff --git a/kandinsky/Makefile b/kandinsky/Makefile
index 2a4619ced..bf493bf65 100644
--- a/kandinsky/Makefile
+++ b/kandinsky/Makefile
@@ -1,5 +1,11 @@
 SFLAGS += -Ikandinsky/include
-objs += $(addprefix kandinsky/src/, font.o line.o pixel.o rect.o text.o types.o)
+objs += $(addprefix kandinsky/src/,\
+				font.o\
+				line.o\
+				pixel.o\
+				rect.o\
+				text.o\
+				types.o)
 tests += $(addprefix kandinsky/test/, set_pixel.c)
 
 FREETYPE_PATH := /usr/local/Cellar/freetype/2.6.3
diff --git a/poincare/Makefile b/poincare/Makefile
index a9cd01c5c..bd0807155 100644
--- a/poincare/Makefile
+++ b/poincare/Makefile
@@ -1,7 +1,25 @@
 SFLAGS += -Ipoincare/include
-objs += $(addprefix poincare/src/, addition.o context.o expression.o float.o integer.o fraction.o expression_lexer.o expression_parser.o subtraction.o power.o product.o symbol.o)
-objs += $(addprefix poincare/src/layout/, expression_layout.o fraction_layout.o horizontal_layout.o exponent_layout.o string_layout.o)
-tests += $(addprefix poincare/test/, integer.cpp)
+objs += $(addprefix poincare/src/,\
+				addition.o\
+				context.o\
+				expression.o\
+				float.o\
+				integer.o\
+				fraction.o\
+				expression_lexer.o\
+				expression_parser.o\
+				subtraction.o\
+				power.o\
+				product.o\
+				symbol.o)
+objs += $(addprefix poincare/src/layout/,\
+				expression_layout.o\
+				fraction_layout.o\
+				horizontal_layout.o\
+				exponent_layout.o\
+				string_layout.o)
+tests += $(addprefix poincare/test/,\
+				 integer.cpp)
 
 # Even though flex and bison will generate both implementation and headers at
 # once, we don't declare it in the Makefile. If we did, "make -jN" with N>1 may