Clean up main.cpp a bit.