We don't need this repetitive namespace open / close thingie...

And unindent to make it look more like C++ than Java.

Change-Id: I67562cf17c32c40c321b492e9b05c2321a51e126