teiiddes-1902

Made properties and parameterMap local variables