Clean up constructor and derivation whitespace

Change-Id: I47d688a9c10c4c3c868accc34102fb402ebcac62
1 file changed