Various style changes [ci skip]