Switched events to using collections and fixed up formatting in parts.