case 2022 - code style fixes