Made suggested changes