Some more refactoring based off of metric_fu reports