fix: spacing and inconsistent ES6 usage