Cleanup, rename and update field functions