switch to es6 syntax for all classes