1 files changed, 10 insertions, 16 deletions

diff --git a/quantum/template/template.c b/quantum/template/template.c
index 7be7dfc3d..7dcd67cfc 100644
--- a/quantum/template/template.c
+++ b/quantum/template/template.c
@@ -1,29 +1,23 @@
 #include "%KEYBOARD%.h"
 
 __attribute__ ((weak))
-void * matrix_init_user(void) {
+void matrix_init_user(void) {
         // leave these blank
-};
+}
 
 __attribute__ ((weak))
-void * matrix_scan_user(void) {
+void matrix_scan_user(void) {
         // leave these blank
-};
+}
 
-void * matrix_init_kb(void) {
+void matrix_init_kb(void) {
         // put your keyboard start-up code here
         // runs once when the firmware starts up
+        matrix_init_user();
+}
 
-        if (matrix_init_user) {
-                (*matrix_init_user)();
-        }
-};
-
-void * matrix_scan_kb(void) {
+void matrix_scan_kb(void) {
         // put your looping keyboard code here
         // runs every cycle (a lot)
-
-        if (matrix_scan_user) {
-                (*matrix_scan_user)();
-        }
-};
\ No newline at end of file
+        matrix_scan_user();
+}
\ No newline at end of file