Cleanup: Addressing PR comments