Cleanup jshint beautify naming conventions