Tidy up, add more namespaces.