Minor improvements by introducing getters and setters instead of combinators

Change-Id: Ifcc801bab9ae8d085cef492880e81b7c0c71d19c
13 files changed