diff --git a/epicardium/epicardium.h b/epicardium/epicardium.h
index 435c9564760ff534ae9d905ed6a1c42f50dfaaf7..d5af7aefe1262e31df689181ceba6f903ba4c079 100644
--- a/epicardium/epicardium.h
+++ b/epicardium/epicardium.h
@@ -12,7 +12,7 @@ API(API_UART_WRITE, void epic_uart_write_str(const char*str, intptr_t length));
 #define API_UART_READ  0x2
 API(API_UART_READ, char epic_uart_read_chr(void));
 
-#define API_LEDS_SET  0x3
+#define API_LEDS_SET   0x3
 API(API_LEDS_SET, void epic_leds_set(int led, uint8_t r, uint8_t g, uint8_t b));
 
 #endif /* _EPICARDIUM_H */
diff --git a/epicardium/main.c b/epicardium/main.c
index 931779d1b4c6dd4f0415046acaf290d5d25915d5..40ef9e9aca73a75f9ba75f584d0186b51bdd2926 100644
--- a/epicardium/main.c
+++ b/epicardium/main.c
@@ -37,7 +37,7 @@ int main(void)
 	card10_init();
 	card10_diag();
 
-    cdcacm_init();
+	cdcacm_init();
 
 	printf("Initializing dispatcher ...\n");
 	api_dispatcher_init();
diff --git a/pycardium/main.c b/pycardium/main.c
index 5c6b38a764f146ae4aa7f2e375478ef2677ad6dc..017684f215c1dde8bcb7099ec3ea3fcf0b8f10fa 100644
--- a/pycardium/main.c
+++ b/pycardium/main.c
@@ -2,7 +2,7 @@
 #include "py/gc.h"
 #include "lib/utils/pyexec.h"
 
-static char *stack_top;
+static char* stack_top;
 static char heap[4096];
 
 int main(void)
@@ -24,9 +24,11 @@ int main(void)
 void gc_collect(void)
 {
 	/* TODO: Replace this with a proper heap implementation */
-	void*dummy;
+	void* dummy;
 
 	gc_collect_start();
-	gc_collect_root(&dummy, ((mp_uint_t)stack_top - (mp_uint_t)&dummy) / sizeof(mp_uint_t));
+	gc_collect_root(
+		&dummy,
+		((mp_uint_t)stack_top - (mp_uint_t)&dummy) / sizeof(mp_uint_t));
 	gc_collect_end();
 }
diff --git a/pycardium/modules/leds.c b/pycardium/modules/leds.c
index 2852e2733d33fe17d917ea7d584c21a31ff0159a..5efa13860b3868fd0760775ebf32880c2dd0d7d9 100644
--- a/pycardium/modules/leds.c
+++ b/pycardium/modules/leds.c
@@ -11,7 +11,7 @@ static mp_obj_t mp_leds_set(mp_obj_t led_in, mp_obj_t color_in)
 	if (!mp_obj_is_type(color_in, &mp_type_list)) {
 		mp_raise_TypeError("color must be a list");
 	}
-	mp_obj_list_t*color = MP_OBJ_TO_PTR(color_in);
+	mp_obj_list_t* color = MP_OBJ_TO_PTR(color_in);
 
 	if (color->len < 3) {
 		mp_raise_ValueError("color list must have 3 elements");
@@ -35,7 +35,7 @@ static const mp_rom_map_elem_t leds_module_globals_table[] = {
 static MP_DEFINE_CONST_DICT(leds_module_globals, leds_module_globals_table);
 
 const mp_obj_module_t leds_module = {
-	.base = { &mp_type_module },
+	.base    = { &mp_type_module },
 	.globals = (mp_obj_dict_t*)&leds_module_globals,
 };
 
diff --git a/pycardium/modules/utime.c b/pycardium/modules/utime.c
index 7cf3d93fb909075ed71698650e314a910cc0b207..86725b3081442c96d3451e632a1d109281600c74 100644
--- a/pycardium/modules/utime.c
+++ b/pycardium/modules/utime.c
@@ -4,10 +4,10 @@
 #include "mxc_delay.h"
 
 static const mp_rom_map_elem_t time_module_globals_table[] = {
-	{MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime)},
-	{MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj)},
-	{MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj)},
-	{MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj)},
+	{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_utime) },
+	{ MP_ROM_QSTR(MP_QSTR_sleep), MP_ROM_PTR(&mp_utime_sleep_obj) },
+	{ MP_ROM_QSTR(MP_QSTR_sleep_ms), MP_ROM_PTR(&mp_utime_sleep_ms_obj) },
+	{ MP_ROM_QSTR(MP_QSTR_sleep_us), MP_ROM_PTR(&mp_utime_sleep_us_obj) },
 #if 0
 	/* TODO: Implement those */
 	{MP_ROM_QSTR(MP_QSTR_ticks_ms), MP_ROM_PTR(&mp_utime_ticks_ms_obj)},
@@ -20,7 +20,7 @@ static const mp_rom_map_elem_t time_module_globals_table[] = {
 static MP_DEFINE_CONST_DICT(time_module_globals, time_module_globals_table);
 
 const mp_obj_module_t mp_module_utime = {
-	.base = { &mp_type_module },
+	.base    = { &mp_type_module },
 	.globals = (mp_obj_dict_t*)&time_module_globals,
 };
 
diff --git a/pycardium/mphalport.c b/pycardium/mphalport.c
index 723fe844d9b4bd040649e609148f22b5b0d0287a..ddaf9841bf5fc3af4568b943d82d49bec300692d 100644
--- a/pycardium/mphalport.c
+++ b/pycardium/mphalport.c
@@ -20,7 +20,7 @@ int mp_hal_stdin_rx_chr(void)
 }
 
 /* Send string of given length */
-void mp_hal_stdout_tx_strn(const char *str, mp_uint_t len)
+void mp_hal_stdout_tx_strn(const char* str, mp_uint_t len)
 {
 	epic_uart_write_str(str, len);
 }
@@ -43,10 +43,14 @@ void mp_hal_delay_us(mp_uint_t us)
  * Fatal Errors
  */
 
-void NORETURN nlr_jump_fail(void *val)
+void NORETURN nlr_jump_fail(void* val)
 {
 	/* TODO: Report error and restart */
+	char msg[] = " >>> nlr_jump_fail <<<\r\n";
+	epic_uart_write_str(msg, sizeof(msg));
+
 	while (1) {
+		__asm("nop");
 	}
 }
 
@@ -54,13 +58,13 @@ void NORETURN nlr_jump_fail(void *val)
  * Stubs
  */
 
-mp_lexer_t *mp_lexer_new_from_file(const char *filename)
+mp_lexer_t* mp_lexer_new_from_file(const char* filename)
 {
 	/* TODO: Do we need an implementation for this? */
 	mp_raise_OSError(MP_ENOENT);
 }
 
-mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs)
+mp_obj_t mp_builtin_open(size_t n_args, const mp_obj_t* args, mp_map_t* kwargs)
 {
 	/* TODO: Once fs is implemented, get this working as well */
 	return mp_const_none;