Cleaned up trigger events for manual changes
-some code cleanup from recent changes