Minor style changes and cleanups