Updated following PR review comments