Clean up the main.cc