Address review comments'