Minor code-style cleanups