Made suggested improvements