Minor style cleanups