Added: Metric fu
Changed: Minor refactoring