Fixed some things and ran goformat.

Fixes #2