Yes, I will standardize on event, and I realized that getViewDefFromEvent was no longer needed, so it will be removed.