Function renaming and refactoring of passed SN variables