Cleaning up some extra code from rebasing.

Fixing styling and updating triggering to work better if the code was minimized.