Updated following PR comments