Follow-up on review

- Increased code coverage
- Made some comments more precise
- Consistency adjustments