Move listeners out of main class for organization