Resolve comments from previos commit (in review)

Change-Id: I488b8d6aa7e2b0ac58cc58ec168d1d81ced1ac3c