diff --git a/Makefile b/Makefile
index 434c3b5..1d79767 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 CC = cc
 CFLAGS = -g -Wall -Iinclude -I/opt/homebrew/include
-SOURCES = src/main.c src/window_state.c
-OBJECTS = src/main.o src/window_state.o
+SOURCES = src/main.c src/state.c
+OBJECTS = src/main.o src/state.o
 LDFLAGS = -L/opt/homebrew/lib
 LDLIBS = -lraylib -lm -lsqlite3
 HEADERS = \
-	include/raygui.h include/common.h include/window_state.h
+	include/raygui.h include/common.h include/state.h
 
 PREFIX ?= /usr/local
 BINDIR := $(PREFIX)/bin
@@ -16,14 +16,14 @@ BINDIR := $(PREFIX)/bin
 # %.o: %.c $(HEADERS)
 # 	$(CC) $(CFLAGS) -c $< -o $@
 
-adhd: src/main.o src/window_state.o
-	$(CC) $(CFLAGS) src/main.o src/window_state.o -o $@ $(LDFLAGS) $(LDLIBS)
+adhd: src/main.o src/state.o
+	$(CC) $(CFLAGS) src/main.o src/state.o -o $@ $(LDFLAGS) $(LDLIBS)
 
 src/main.o: src/main.c $(HEADERS)
 	$(CC) -c $(CFLAGS) src/main.c -o $@
 
-src/window_state.o: src/window_state.c $(HEADERS)
-	$(CC) -c $(CFLAGS) src/window_state.c -o $@
+src/state.o: src/state.c $(HEADERS)
+	$(CC) -c $(CFLAGS) src/state.c -o $@
 clean:
 	rm -rf $(OBJECTS) adhd
 
diff --git a/include/window_state.h b/include/state.h
similarity index 79%
rename from include/window_state.h
rename to include/state.h
index cfa844a..ff3be52 100644
--- a/include/window_state.h
+++ b/include/state.h
@@ -1,5 +1,5 @@
-#ifndef WINDOWSTATE_H
-#define WINDOWSTATE_H
+#ifndef STATE_H
+#define STATE_H
 
 #include "common.h"
 #include <stddef.h>
@@ -11,8 +11,8 @@ enum mode_t {
 };
 typedef enum mode_t Mode;
 
-void init_window_state();
-void cleanup_window_state();
+void init_state();
+void cleanup_state();
 
 void set_intention(char *intention);
 char *get_intention();
diff --git a/src/main.c b/src/main.c
index c1b783d..14ea236 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,7 +6,7 @@
 #define RAYGUI_IMPLEMENTATION
 #include <raygui.h>
 #include <raylib.h>
-#include "window_state.h"
+#include "state.h"
 #include "common.h"
 
 #define WINDOW_HEIGHT 700
@@ -170,7 +170,7 @@ int main(int argc, char *argv[]) {
   localtime_r(&now, &local_time);
   mktime(&local_time);
   
-  init_window_state();
+  init_state();
   
   printf("Welcome to Flowy.adhd\n");
 
@@ -190,5 +190,7 @@ int main(int argc, char *argv[]) {
 
   CloseWindow();
 
+  cleanup_state();
+
   return 0;
 }
diff --git a/src/window_state.c b/src/state.c
similarity index 98%
rename from src/window_state.c
rename to src/state.c
index 9bb8323..8b05827 100644
--- a/src/window_state.c
+++ b/src/state.c
@@ -1,4 +1,4 @@
-#include "window_state.h"
+#include "state.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -101,7 +101,7 @@ static void db_get_all_records() {
   assert(rc == SQLITE_OK);
 }
 
-void init_window_state() {
+void init_state() {
   s = malloc(sizeof(struct state));
   s->mode = WINDOW;
 
@@ -170,7 +170,7 @@ static void generate_key(struct tm *time, char *buffer, size_t buffer_size) {
   snprintf(buffer, buffer_size, "%d", time->tm_yday);
 }
 
-void cleanup_window_state() {
+void cleanup_state() {
   if (!s) {
     return;
   }