Updated namespaces, some formatting