Clean up trigger class a little bit.