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
Reverting some of the refactor
Merge pull request #624 from TheIronDeveloper/gulp

Second Pass at cleaning up the code.