Variable names and comments changes.