Reformatted some files - also using Set in getFriendlyEffectNames