Formatting and style fixes [ci skip]