Some cleanup, 100% coverage.