First round of changes. Might be an overkill but put this together before Mihail's reply'

Change-Id: I921b6dd86a665b9d9af18189408c83ef88a6e93f