Better comments in the source code