Made suggested fixes.