Feature/nist cleanup