Normalise custom event names
More style tweaks