Fixed review notes by gihub alias dbrgn
Fixed review comments by carljm