Code cleanup
Add coverage (auto-generated)