Some small style cleanups
Added back some missing statsd events