Fixed reviewer remarks