Minor tweaks

Just some minor tweaks to make the code more readable
Minor tweaks