Cleaned up location of metrics data
improved metrics tracking and thread-safety just a bit