Cleaned up chatlistener a bit