Renamed some state stuff, trying to better format IRC messages, removing duplicate code