Cosmetic changes/indentation and slight renaming of variables/functions.