Made suggested tweaks