Initial Flake-8 pass.

Initially just getting Flake-8 to pass before performing any meaningful cleanup.