small refactoring

Change-Id: Ib2000a984e3ee2653b02e53f41134fefda2117c9
removed email address from comments

Change-Id: I0ba3d8576afd31a3a773766d06c484db3e174469