Move methods out of listeners