Cleaned up functio code out of Preview & Edit
and of Update actions