Whitespace, line length, and other linter type fixes.