Clean up and greatly optimize listeners