Beautify + Linter Errors

Just cleaning up a few linter warnings/errors and formatting before
larger changes.