Code refactored.

Error when calling FieldChecker functions still exist. :((