Constructor cleanup

Change-Id: Ic39911d08f44c3174de91fb92fcd4cab73fe4654
6 files changed