Remove listener interfaces and make listener methods private