Added formatted events and cleaned up some of the other classes