Remove namespaces, tabs -> spaces
Update documentation