OPT: Prevent iterating across n_features twice
Merge pull request #3653 from MechCoder/minor_opt

[MRG] OPT: Prevent iterating across n_features twice