Re-added data, fixed jshint errors