(chore): apply changes as per review