Small style changes.
Breaking this out into two projects starting right now.