Fix indentation
Change metric names as suggested
Change suffix to unit, remove need for prefix