Small cleanup in main