Neaten up code

[chrishutchinson]

• Convert into cleaner ES2015+ where possible
• Run Prettier across all files
• Clean up linting issues