Refactorings & reformats

[ColinEberhardt]

Thanks @MaxGraey - all looks good.

Would be great to be able to use prettier in order to auto-format - ref https://github.com/AssemblyScript/assemblyscript/issues/1738 :-)

[github-actions[bot]]

:tada: This PR is included in version 2.2.1 :tada:

The release is available on:

• npm package (@latest dist-tag)
• GitHub release

Your semantic-release bot :package::rocket: