separation of concerns

Change-Id: I8d7ce644174c651ed19c3abf16c5b91cefa952de