better NL cleanup + more control