diff --git a/Makefile b/Makefile
index 4a33b99..74fcee0 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,6 @@ SUBDIR_LIB := libslunkcrypt
 # Flags
 # ---------------------------------------------------------------------------
 
-CONFIG =
-LDFLGS =
 CFLAGS = -I$(SUBDIR_LIB)/include -std=gnu99 -Wall -pedantic
 
 ifneq (,$(firstword $(filter 32 64,$(CPU))))
@@ -47,17 +45,19 @@ endif
 ifneq ($(ASAN),0)
   CONFIG := _a
   CFLAGS += -O1 -g -fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls
-else ifneq ($(DEBUG),0)
-  CONFIG := _g
-  CFLAGS += -Og -g
 else
-  CFLAGS += -O3 -DNDEBUG
-ifneq ($(FLTO),0)
-  CFLAGS += -flto
-endif
-ifneq ($(FPGO),0)
-  CFLAGS += -fprofile-$(firstword $(FPGO))
-endif
+  ifneq ($(DEBUG),0)
+    CONFIG := _g
+    CFLAGS += -Og -g
+  else
+    CFLAGS += -O3 -DNDEBUG
+    ifneq ($(FLTO),0)
+      CFLAGS += -flto
+    endif
+    ifneq ($(FPGO),0)
+      CFLAGS += -fprofile-$(firstword $(FPGO))
+    endif
+  endif
 endif
 ifneq ($(NALYZE),0)
   CFLAGS += -fanalyzer
@@ -71,9 +71,7 @@ else
 endif
 
 ifneq (,$(firstword $(filter %mingw32 %-windows-gnu %-cygwin %-cygnus,$(MACHINE))))
-  SUFFIX := .exe
-else
-  SUFFIX :=
+  EXE_SUFFIX := .exe
 endif
 
 ifneq (,$(firstword $(filter %-w64-mingw32 %w64-windows-gnu,$(MACHINE))))
@@ -102,7 +100,7 @@ endif
 # File names
 # ---------------------------------------------------------------------------
 
-OUTNAME_APP := slunkcrypt$(CONFIG)$(SUFFIX)
+OUTNAME_APP := slunkcrypt$(CONFIG)$(EXE_SUFFIX)
 OUTNAME_LIB := libslunkcrypt$(CONFIG)-1.a
 
 OUTPATH_APP := $(SUBDIR_APP)/bin/$(OUTNAME_APP)
@@ -148,6 +146,5 @@ $(SUBDIR_LIB)/obj/%$(CONFIG).o: $(SUBDIR_LIB)/src/%.c
 	$(CC) $(CFLAGS) -c $< -o $@
 
 clean:
-	$(RM) $(SUBDIR_APP)/obj/*.o $(SUBDIR_APP)/obj/*.gcda $(SUBDIR_APP)/lib/*.a $(SUBDIR_APP)/bin/*$(SUFFIX)
-	$(RM) $(SUBDIR_LIB)/obj/*.o $(SUBDIR_LIB)/obj/*.gcda $(SUBDIR_LIB)/lib/*.a $(SUBDIR_LIB)/bin/*$(SUFFIX)
-
+	$(RM) $(SUBDIR_APP)/obj/*.o $(SUBDIR_APP)/obj/*.gcda $(SUBDIR_APP)/lib/*.a $(SUBDIR_APP)/bin/*$(EXE_SUFFIX)
+	$(RM) $(SUBDIR_LIB)/obj/*.o $(SUBDIR_LIB)/obj/*.gcda $(SUBDIR_LIB)/lib/*.a $(SUBDIR_LIB)/bin/*$(EXE_SUFFIX)