Made the suggested changes