Minor cleanup
Changed some variable names for clarity
Output tweaks to pass test 0