Fixing EC6 script issue; fixing naming and jshint styling