(chore): Resolve !235 feedback (I)