Remove logging the metric as CloudWatch is showing the correct numbers
Better metric names and other code optimization