Minor code style updates