Minor tweaks

Let me know if you need me to change something :)