Done and moved the metric check to consistent naming and style