[C16] applied pull request comments