fixed late PR comments