Code Cleanup; Added basic support for event listeners