Increased code coverage
Simplified code. Increased code coverage.