Trigger refactor

Full review of trigger call in class file.