Merge with event

Clean minor stuff to pass jshint error