Clean and improve NAMESPACE