Better comments 

Better comments and other things.