Re-added initialization of namespaces (removed June '12), fixed spacing

Change-Id: I04b5c4b3b0e9898a6f597a65822071f530a94d30