Addressing CR feedback:
- #241