clean up and add some Metrics