chore: suggestions from review