Re-naming email parameters to variable to avoid confusion with top-level parameters
Moving out subject key to one level up