Clean up listen.c