Cleaned up event listeners and adjusted composer.json