Audit / clean up
foreach if not empty fix