Code isolation and strict mode.
Minor code cleaning.