Better comments and formatting.