review comments fix