Some code style fixes [skip ci]