Normalized namespaces

Here it goes again :wink: This time without excessive whitespace :lipstick: