Better comments in the code