Added listener code as well as Logger

You don't need this.. Remove it