Some 'var's to 'const'