Made suggested changes

All done