Use row slicing and nonZero iterators.  Clean Up