finishing namespaces
formatting fix merge