Address bnoordhuis comments