Made suggested PR changes