refactored event features steps into fewer steps