Little cleanup in main.cpp