Implemented tidy namespacing ability