Tweaks thanks to @javiereguiluz
Fixing coding standards
Adding line breaks, but no changes
Fixing bug that caused paths to be missing a slash