Namespacing/code style changes