Fixed reviewer suggestions #2