Address ben review comments