diff --git a/todolist.md b/todolist.md
index d4d878a5..0d4c0dc3 100644
--- a/todolist.md
+++ b/todolist.md
@@ -2,11 +2,7 @@
 
 ### Not done
 
-- [ ] Tests
-
-- [ ] Proper error handling
-
-- [ ] Optimization/Cleanup
+- [ ] Optimization
 
 - [ ] Search and replace
 
@@ -39,6 +35,12 @@
 
 - [x] Line numbers
 
+- [x] Tests
+
+- [x] Proper error handling
+
+- [x] Cleanup
+
 - [x] Syntax highlighting
     - [x] Use nano-like syntax files (https://github.com/scopatz/nanorc)