Visual formatting, comments, and typo/bugfixes