More coding style namespace stuff