Cleaning up namespaces, introducing helpers and a simple measurement buffer