Begin addressing comments
Address review comments