cleaned up event saving process