Some cleanup and adding statsd