removed redundant listener and better comment for future me