formatting, moved logic to CodeCoverage class, removed old clases