Cleaning up the code a little to reduce warnings on grunt.