CodeCoverage: Applied SD5 suggestions