Minor cleanups

Mainly just getting to a consistent code-style.