Formatting: Various style fixes