Greatly improved readability of main.c