Applying code suggestions from grunt.