Metrics Fix and Readability Improvements