Reorganized methods within Trigger class