refactor variables

Change-Id: Id88a5996351de70b1961f63ce73b6a5c4779dd9e
Add ',' to satisfy sonar

Change-Id: I24864ebcadda66907dcd19983709c6eb063d48ca