Add EndListener
Cleanup imports/comments