More KNF and clean up.