Updated to reflect position change and made minor adjustments to make code more readable
Minor adjustments to spacing