separation of concerns

Change-Id: I2ec52e748960f103872ee8e8fef05112cce4ee81