simplified Event class and unified brace usage style

Also tweaked a doc comment and changed a variable name