Reorganize main() a bit