Cleanups

Minor style fixes.