Eliminated redundancies
Working on editing existing events