fix namespaces, syntax; cosmetics