Cleaned up Add/Remove Event Listeners