12: coding style fixes