Feedback from Code Review Process

Change-Id: I8a7ab3ff699a688ea3fae25a4e26a8128f797d89