Cleaning up event.php