Changes to readability and addition of metrics