Refactor bulk invite even more