Move comments, change variable names, and make other stylistic changes.