Removed a few stray events.
Style tweaks.