Cleaning up Listeners / Finalizers

1. Listeners changed to Actions and made protected
2. Finalizers changed to Listeners and made protected