Pulled out all methods from Listeners into outside class