Code cleanup.
XXX: Add signal handling so a cleanup
happens when user hits ctrl+c to quit.