Updated after filtering through jshint