Cleaning up code to pass jshint

Disabling failed tests