Second Pass at cleaning up the code. 

These are pretty safe edits that include adding 0 to decimal values, fixing variables that are declared multiple times, and removing duplicate keys.

If there was any risk at all, I avoided fixing a "duplicate keys" message for the time being.