clean up + use defines for trigger names