Improve encapsulation

Change-Id: I30d28c3a62cc5de3432f04b6469eca077ee3eff6
2 files changed