Changed methods to lcc. Used iterators for populating valids.
Merge remote-tracking branch 'origin/master'
Fixed casing error