Fix comments and clean up in main.c