Cleaned up Breadth of Coverage and Depth of Coverage calculation