Minor code format cleanups