Changed how field functions are called in decorator
Removed unnecessary code