ErroredFields -> erroredFields
few optimizations
Merge pull request #6 from orefalo/master

Code clean up and optimization