Switched to more compact namespace style