RPBI: Address Github reviewers comments.