Minor refactor of 01.c