separation of concerns

Change-Id: Ia51741ff0e19d44ee9f2017f230d8afe1f4f0b32