Organizes listeners logically once more :)