Fix namespaces
Code cleanup