Better comments in Main