Renaming Trigger.cs and cleaning up Apply